bitkeeper revision 1.1159.212.38 (41f6537aX7dfqsdH6-jWzX24faBDtQ)

author kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>

Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)

committer kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>

Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)
author kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)
committer kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)
diff --cc xen/Makefile
Simple merge
diff --cc xen/arch/x86/Makefile
Simple merge
diff --cc xen/arch/x86/domain.c
Simple merge
diff --cc xen/common/physdev.c
Simple merge
author	kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
	Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)
committer	kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
	Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)
		1	2
xen/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/domain.c	patch \|	diff1 \|	diff2 \|	blob \| history
xen/common/physdev.c	patch \|	diff1 \|	diff2 \|	blob \| history